Work on Windows port by Ruben Van Boxem git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@140384 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/__bit_reference b/include/__bit_reference index d62bec7..53d3c86 100644 --- a/include/__bit_reference +++ b/include/__bit_reference
@@ -687,12 +687,12 @@ // swap_ranges -template <class _C1, class _C2> -__bit_iterator<_C2, false> -__swap_ranges_aligned(__bit_iterator<_C1, false> __first, __bit_iterator<_C1, false> __last, - __bit_iterator<_C2, false> __result) +template <class __C1, class __C2> +__bit_iterator<__C2, false> +__swap_ranges_aligned(__bit_iterator<__C1, false> __first, __bit_iterator<__C1, false> __last, + __bit_iterator<__C2, false> __result) { - typedef __bit_iterator<_C1, false> _I1; + typedef __bit_iterator<__C1, false> _I1; typedef typename _I1::difference_type difference_type; typedef typename _I1::__storage_type __storage_type; static const unsigned __bits_per_word = _I1::__bits_per_word; @@ -737,12 +737,12 @@ return __result; } -template <class _C1, class _C2> -__bit_iterator<_C2, false> -__swap_ranges_unaligned(__bit_iterator<_C1, false> __first, __bit_iterator<_C1, false> __last, - __bit_iterator<_C2, false> __result) +template <class __C1, class __C2> +__bit_iterator<__C2, false> +__swap_ranges_unaligned(__bit_iterator<__C1, false> __first, __bit_iterator<__C1, false> __last, + __bit_iterator<__C2, false> __result) { - typedef __bit_iterator<_C1, false> _I1; + typedef __bit_iterator<__C1, false> _I1; typedef typename _I1::difference_type difference_type; typedef typename _I1::__storage_type __storage_type; static const unsigned __bits_per_word = _I1::__bits_per_word; @@ -837,11 +837,11 @@ return __result; } -template <class _C1, class _C2> +template <class __C1, class __C2> inline _LIBCPP_INLINE_VISIBILITY -__bit_iterator<_C2, false> -swap_ranges(__bit_iterator<_C1, false> __first1, __bit_iterator<_C1, false> __last1, - __bit_iterator<_C2, false> __first2) +__bit_iterator<__C2, false> +swap_ranges(__bit_iterator<__C1, false> __first1, __bit_iterator<__C1, false> __last1, + __bit_iterator<__C2, false> __first2) { if (__first1.__ctz_ == __first2.__ctz_) return __swap_ranges_aligned(__first1, __last1, __first2); @@ -1213,15 +1213,15 @@ template <class _D, bool _IC> friend __bit_iterator<_D, false> copy_backward(__bit_iterator<_D, _IC> __first, __bit_iterator<_D, _IC> __last, __bit_iterator<_D, false> __result); - template <class _C1, class _C2>friend __bit_iterator<_C2, false> __swap_ranges_aligned(__bit_iterator<_C1, false>, - __bit_iterator<_C1, false>, - __bit_iterator<_C2, false>); - template <class _C1, class _C2>friend __bit_iterator<_C2, false> __swap_ranges_unaligned(__bit_iterator<_C1, false>, - __bit_iterator<_C1, false>, - __bit_iterator<_C2, false>); - template <class _C1, class _C2>friend __bit_iterator<_C2, false> swap_ranges(__bit_iterator<_C1, false>, - __bit_iterator<_C1, false>, - __bit_iterator<_C2, false>); + template <class __C1, class __C2>friend __bit_iterator<__C2, false> __swap_ranges_aligned(__bit_iterator<__C1, false>, + __bit_iterator<__C1, false>, + __bit_iterator<__C2, false>); + template <class __C1, class __C2>friend __bit_iterator<__C2, false> __swap_ranges_unaligned(__bit_iterator<__C1, false>, + __bit_iterator<__C1, false>, + __bit_iterator<__C2, false>); + template <class __C1, class __C2>friend __bit_iterator<__C2, false> swap_ranges(__bit_iterator<__C1, false>, + __bit_iterator<__C1, false>, + __bit_iterator<__C2, false>); template <class _D> friend __bit_iterator<_D, false> rotate(__bit_iterator<_D, false>, __bit_iterator<_D, false>, __bit_iterator<_D, false>);